Revision: baz--resolve--1.2--patch-7
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Sun Jan 30 23:13:55 EST 2005
Standard-date: 2005-01-31 04:13:55 GMT
Modified-files: tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-7
Summary: Added one more pre-merge test for baz merge
Keywords: 

